[IA64] remaining warnings removed

Warnings cleanup.
-Werror added when no_warns=y

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>

diff --git a/xen/arch/ia64/Rules.mk b/xen/arch/ia64/Rules.mk
index 55cbeacaaaacb3b407f580a2529f34b8680eee22..e6ae9a50a97fcd2b375f57d212ad066e4780c8c7 100644 (file)
--- a/xen/arch/ia64/Rules.mk
+++ b/xen/arch/ia64/Rules.mk
@@ -40,7 +40,7 @@ ifeq ($(xen_ia64_dom0_virtual_physical),y)
 CFLAGS += -DCONFIG_XEN_IA64_DOM0_VP
 endif
 ifeq ($(no_warns),y)
-CFLAGS += -Wa,--fatal-warnings
+CFLAGS += -Wa,--fatal-warnings -Werror -Wno-uninitialized
 endif
 
 LDFLAGS := -g

diff --git a/xen/arch/ia64/linux-xen/iosapic.c b/xen/arch/ia64/linux-xen/iosapic.c
index e5639ffe7ff4ce80e77140cccd5c34c7c87acfb6..7c34876caf28d7baabeaa969cd723f1dc9ae8e95 100644 (file)
--- a/xen/arch/ia64/linux-xen/iosapic.c
+++ b/xen/arch/ia64/linux-xen/iosapic.c
@@ -1112,12 +1112,14 @@ map_iosapic_to_node(unsigned int gsi_base, int node)
 }
 #endif
 
+#ifndef XEN
 static int __init iosapic_enable_kmalloc (void)
 {
        iosapic_kmalloc_ok = 1;
        return 0;
 }
 core_initcall (iosapic_enable_kmalloc);
+#endif
 
 #ifdef XEN
 /* nop for now */

diff --git a/xen/arch/ia64/linux-xen/sal.c b/xen/arch/ia64/linux-xen/sal.c
index 475435d3741a527d4e79313cf5ff5e4738fe1db8..ad81a29ad8181671927037bb3f2ca04075a74d90 100644 (file)
--- a/xen/arch/ia64/linux-xen/sal.c
+++ b/xen/arch/ia64/linux-xen/sal.c
@@ -229,7 +229,12 @@ ia64_sal_init (struct ia64_sal_systab *systab)
                return;
        }
 
+#ifdef XEN /* warning cleanup */
+       if (strncmp((char *)systab->signature, "SST_", 4) != 0)
+#else
        if (strncmp(systab->signature, "SST_", 4) != 0)
+#endif
+               
                printk(KERN_ERR "bad signature in system table!");
 
        check_versions(systab);

diff --git a/xen/arch/ia64/linux-xen/smp.c b/xen/arch/ia64/linux-xen/smp.c
index 3b7da3f08dd82dcf89544e8f92457c899ee1e70b..760349abf07e03463727dac3d568c780f55ae10a 100644 (file)
--- a/xen/arch/ia64/linux-xen/smp.c
+++ b/xen/arch/ia64/linux-xen/smp.c
@@ -196,7 +196,9 @@ handle_IPI (int irq, void *dev_id, struct pt_regs *regs)
                mb();   /* Order data access and bit testing. */
        }
        put_cpu();
+#ifndef XEN
        return IRQ_HANDLED;
+#endif
 }
 
 /*

diff --git a/xen/arch/ia64/linux-xen/smpboot.c b/xen/arch/ia64/linux-xen/smpboot.c
index 0b4f1d0f54f553d33d6bd13e6107977335b4a8bf..cfb96987cc281377d5a61c8cc923ae34dfb294bc 100644 (file)
--- a/xen/arch/ia64/linux-xen/smpboot.c
+++ b/xen/arch/ia64/linux-xen/smpboot.c
@@ -197,7 +197,11 @@ sync_master (void *arg)
  * negative that it is behind.
  */
 static inline long
+#ifdef XEN /* warning cleanup */
+get_delta (unsigned long *rt, unsigned long *master)
+#else
 get_delta (long *rt, long *master)
+#endif
 {
        unsigned long best_t0 = 0, best_t1 = ~0UL, best_tm = 0;
        unsigned long tcenter, t0, t1, tm;

diff --git a/xen/arch/ia64/linux-xen/time.c b/xen/arch/ia64/linux-xen/time.c
index 03a1c6b917225e6a6ac9ac55f788b475ca15d8e6..6ca173e06a9215b9b7f42d00dd78aa98fc606311 100644 (file)
--- a/xen/arch/ia64/linux-xen/time.c
+++ b/xen/arch/ia64/linux-xen/time.c
@@ -158,7 +158,11 @@ ia64_init_itm (void)
 {
        unsigned long platform_base_freq, itc_freq;
        struct pal_freq_ratio itc_ratio, proc_ratio;
+#ifdef XEN /* warning cleanup */
+       unsigned long status, platform_base_drift, itc_drift;
+#else
        long status, platform_base_drift, itc_drift;
+#endif
 
        /*
         * According to SAL v2.6, we need to use a SAL call to determine the platform base
@@ -197,7 +201,11 @@ ia64_init_itm (void)
        itc_freq = (platform_base_freq*itc_ratio.num)/itc_ratio.den;
 
        local_cpu_data->itm_delta = (itc_freq + HZ/2) / HZ;
+#ifdef XEN /* warning cleanup */
+       printk(KERN_DEBUG "CPU %d: base freq=%lu.%03luMHz, ITC ratio=%u/%u, "
+#else
        printk(KERN_DEBUG "CPU %d: base freq=%lu.%03luMHz, ITC ratio=%lu/%lu, "
+#endif
               "ITC freq=%lu.%03luMHz", smp_processor_id(),
               platform_base_freq / 1000000, (platform_base_freq / 1000) % 1000,
               itc_ratio.num, itc_ratio.den, itc_freq / 1000000, (itc_freq / 1000) % 1000);

diff --git a/xen/arch/ia64/vmx/pal_emul.c b/xen/arch/ia64/vmx/pal_emul.c
index a0e173eabad86c95e21dbf759b77281905a880df..adcc7d21d4278594ffdb15acd70735aafaf1da3d 100644 (file)
--- a/xen/arch/ia64/vmx/pal_emul.c
+++ b/xen/arch/ia64/vmx/pal_emul.c
@@ -204,6 +204,10 @@ pal_debug_info(VCPU *vcpu){
 
 static struct ia64_pal_retval
 pal_fixed_addr(VCPU *vcpu){
+       struct ia64_pal_retval result;
+
+       result.status= -1; //unimplemented
+       return result;
 }
 
 static struct ia64_pal_retval

diff --git a/xen/arch/ia64/vmx/vmmu.c b/xen/arch/ia64/vmx/vmmu.c
index a08cc5e7125ef68990e8fcc52621a6bcf1809e1a..4470e53efd2de75bb439a58b06dade247b3a24e5 100644 (file)
--- a/xen/arch/ia64/vmx/vmmu.c
+++ b/xen/arch/ia64/vmx/vmmu.c
@@ -199,8 +199,11 @@ void machine_tlb_insert(struct vcpu *d, thash_data_t *tlb)
     mtlb.page_flags = tlb->page_flags & ~PAGE_FLAGS_RV_MASK;
     mtlb.ppn = get_mfn(d->domain,tlb->ppn);
     mtlb_ppn=mtlb.ppn;
+
+#if 0
     if (mtlb_ppn == INVALID_MFN)
         panic_domain(vcpu_regs(d),"Machine tlb insert with invalid mfn number.\n");
+#endif
 
     psr = ia64_clear_ic();
     if ( cl == ISIDE_TLB ) {

diff --git a/xen/arch/ia64/vmx/vmx_ivt.S b/xen/arch/ia64/vmx/vmx_ivt.S
index 0bf1ae01efa734c10bc5a65a82c8cc90479f9188..c7742476573a5e0d9078242d2e067140c18b56ee 100644 (file)
--- a/xen/arch/ia64/vmx/vmx_ivt.S
+++ b/xen/arch/ia64/vmx/vmx_ivt.S
@@ -180,6 +180,7 @@ vmx_itlb_loop:
     st8 [r17] = r27
     ;;
     itc.i r25
+    dv_serialize_data
     mov r17=cr.isr
     mov r23=r31
     mov r22=b0
@@ -253,6 +254,7 @@ vmx_dtlb_loop:
     st8 [r17] = r27
     ;;    
     itc.d r25
+    dv_serialize_data
     mov r17=cr.isr
     mov r23=r31
     mov r22=b0

diff --git a/xen/arch/ia64/xen/irq.c b/xen/arch/ia64/xen/irq.c
index a6064f4bc40f5324ba5be3e13ef23fa6efa66585..5218d0e3645de3a50154a8d8384cd44323283c27 100644 (file)
--- a/xen/arch/ia64/xen/irq.c
+++ b/xen/arch/ia64/xen/irq.c
@@ -619,10 +619,9 @@ void process_soft_irq(void)
 
 // this is a temporary hack until real console input is implemented
 extern void domain_pend_keyboard_interrupt(int irq);
-irqreturn_t guest_forward_keyboard_input(int irq, void *nada, struct pt_regs *regs)
+void guest_forward_keyboard_input(int irq, void *nada, struct pt_regs *regs)
 {
        domain_pend_keyboard_interrupt(irq);
-       return 0;
 }
 
 void serial_input_init(void)

diff --git a/xen/arch/ia64/xen/process.c b/xen/arch/ia64/xen/process.c
index 27ecb6af3bed6d08c4f30c1cf3a5e5ab87cb5b29..c0441d5eef0fc1a54fb208580cda4a1bd08f44dc 100644 (file)
--- a/xen/arch/ia64/xen/process.c
+++ b/xen/arch/ia64/xen/process.c
@@ -407,8 +407,9 @@ void trap_init (void)
 }
 
 static fpswa_ret_t
-fp_emulate (int fp_fault, void *bundle, long *ipsr, long *fpsr, long *isr, long *pr, long *ifs,
-            struct pt_regs *regs)
+fp_emulate (int fp_fault, void *bundle, unsigned long *ipsr,
+           unsigned long *fpsr, unsigned long *isr, unsigned long *pr,
+           unsigned long *ifs, struct pt_regs *regs)
 {
        fp_state_t fp_state;
        fpswa_ret_t ret;
@@ -437,10 +438,8 @@ fp_emulate (int fp_fault, void *bundle, long *ipsr, long *fpsr, long *isr, long
         *      unsigned long    *pifs,
         *      void             *fp_state);
         */
-       ret = (*fpswa_interface->fpswa)((unsigned long) fp_fault, bundle,
-                                       (unsigned long *) ipsr, (unsigned long *) fpsr,
-                                       (unsigned long *) isr, (unsigned long *) pr,
-                                       (unsigned long *) ifs, &fp_state);
+       ret = (*fpswa_interface->fpswa)(fp_fault, bundle,
+                                       ipsr, fpsr, isr, pr, ifs, &fp_state);
 
        return ret;
 }

diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c
index 1c1f54ab198822817147693139d5bc7dafaecd96..7d60ee04cecef40d83388e848b63eddadb8051db 100644 (file)
--- a/xen/arch/ia64/xen/vcpu.c
+++ b/xen/arch/ia64/xen/vcpu.c
@@ -18,6 +18,7 @@
 #include <asm/vhpt.h>
 #include <asm/tlbflush.h>
 #include <xen/event.h>
+#include <asm/vmx_phy_mode.h>
 
 /* FIXME: where these declarations should be there ? */
 extern void getreg(unsigned long regnum, unsigned long *val, int *nat, struct pt_regs *regs);

diff --git a/xen/arch/ia64/xen/xentime.c b/xen/arch/ia64/xen/xentime.c
index 5d83bf80d05b7e46686f6d3dadc39484559408df..c997b5ad1e5a7758d05130b288dcb87aa015a84a 100644 (file)
--- a/xen/arch/ia64/xen/xentime.c
+++ b/xen/arch/ia64/xen/xentime.c
@@ -105,7 +105,7 @@ void do_settime(unsigned long secs, unsigned long nsecs, u64 system_time_base)
     return;
 }
 
-irqreturn_t
+void
 xen_timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
 {
        unsigned long new_itm, old_itc;
@@ -134,7 +134,7 @@ xen_timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
        new_itm = local_cpu_data->itm_next;
 
        if (!VMX_DOMAIN(current) && !time_after(ia64_get_itc(), new_itm))
-               return IRQ_HANDLED;
+               return;
 
        while (1) {
                new_itm += local_cpu_data->itm_delta;
@@ -185,8 +185,6 @@ xen_timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
                /* double check, in case we got hit by a (slow) PMI: */
        } while (time_after_eq(ia64_get_itc(), new_itm));
        raise_softirq(TIMER_SOFTIRQ);
-
-       return IRQ_HANDLED;
 }
 
 static struct irqaction xen_timer_irqaction = {

diff --git a/xen/include/asm-ia64/linux-xen/linux/interrupt.h b/xen/include/asm-ia64/linux-xen/linux/interrupt.h
index 210cea512af3e5668e6af9ba29062e362c4ed90b..a58afbec08cd10f7307e464dba0fdfd6f418ca6a 100644 (file)
--- a/xen/include/asm-ia64/linux-xen/linux/interrupt.h
+++ b/xen/include/asm-ia64/linux-xen/linux/interrupt.h
@@ -27,7 +27,11 @@
  * IRQ_HANDLED means that we did have a valid interrupt and handled it.
  * IRQ_RETVAL(x) selects on the two depending on x being non-zero (for handled)
  */
+#ifdef XEN
+typedef void irqreturn_t;
+#else
 typedef int irqreturn_t;
+#endif
 
 #define IRQ_NONE       (0)
 #define IRQ_HANDLED    (1)